+emacs22 (22.2+1-1) unstable; urgency=low
+
+ * New upstream release. (closes: #473021)
+
+ * Move dired-x.texi to the non-DFSG package because the license has
+ changed.
+
+ * Update debian/copyright to reflect recent changes.
+
+ * Update debian/dfsg-splitter for new upstream release.
+
+ --
+
emacs22 (22.1+1-3) unstable; urgency=low
* Incorporate a patch to fix a vulnerability in the handling of file
This is the original source archive:
- prep.ai.mit.edu:/pub/gnu/emacs/emacs-22.1.tar.gz
+ prep.ai.mit.edu:/pub/gnu/emacs/emacs-22.2.tar.gz
Please see /usr/share/doc/emacs22-common/README.Debian.gz for a
description of the Debian specific differences from the upstream
License (GPL). See the file /usr/share/common-licenses/GPL for more
information.
- etc/eterm.1 is licensed as follows:
-
- Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of
- this document provided the copyright notice and this permission
- notice are preserved on all copies.
-
- Permission is granted to copy and distribute modified versions
- of this document under the conditions for verbatim copying,
- provided that the entire resulting derived work is distributed
- under the terms of a permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of
- this document into another language, under the above conditions
- for modified versions, except that this permission notice may be
- stated in a translation approved by the Free Software
- Foundation.
-
etc/emacs.1 is licensed as follows:
Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
stated in a translation approved by the Free Software
Foundation.
- man/dired-x.texi is licensed as follows:
-
- Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of
- this manual provided the copyright notice and this permission
- notice are preserved on all copies.
-
- Permission is granted to copy and distribute modified versions
- of this manual under the conditions for verbatim copying,
- provided that the entire resulting derived work is distributed
- under the terms of a permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of
- this manual into another language, under the above conditions
- for modified versions, except that this permission notice may be
- stated in a translation approved by the Free Software
- Foundation.
-
- The file used to create this is called dired-x.texi, but the
- original work that was altered to make that file was called
- dired.texi written by Sebastian Kremer.
-
- Permission is granted to process this file through TeX and print
- the results, provided the printed document carries copying
- permission notice identical to this one except for the removal
- of this paragraph (this paragraph not being relevant to the
- printed manual).
-
man/faq.texi is licensed as follows:
Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner
License (GPL). See the file /usr/share/common-licenses/GPL for more
information.
- etc/eterm.1 is licensed as follows:
-
- Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of
- this document provided the copyright notice and this permission
- notice are preserved on all copies.
-
- Permission is granted to copy and distribute modified versions
- of this document under the conditions for verbatim copying,
- provided that the entire resulting derived work is distributed
- under the terms of a permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of
- this document into another language, under the above conditions
- for modified versions, except that this permission notice may be
- stated in a translation approved by the Free Software
- Foundation.
-
etc/emacs.1 is licensed as follows:
Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
stated in a translation approved by the Free Software
Foundation.
- man/dired-x.texi is licensed as follows:
-
- Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of
- this manual provided the copyright notice and this permission
- notice are preserved on all copies.
-
- Permission is granted to copy and distribute modified versions
- of this manual under the conditions for verbatim copying,
- provided that the entire resulting derived work is distributed
- under the terms of a permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of
- this manual into another language, under the above conditions
- for modified versions, except that this permission notice may be
- stated in a translation approved by the Free Software
- Foundation.
-
- The file used to create this is called dired-x.texi, but the
- original work that was altered to make that file was called
- dired.texi written by Sebastian Kremer.
-
- Permission is granted to process this file through TeX and print
- the results, provided the printed document carries copying
- permission notice identical to this one except for the removal
- of this paragraph (this paragraph not being relevant to the
- printed manual).
-
man/faq.texi is licensed as follows:
Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner
# run the script. The resulting two orig.tar.gz files will be placed
# into a new ./split-tmp directory.
-emacs_archive_name="emacs-22.1.tar.gz"
-emacs_dir="emacs-22.1"
-emacs_version="22.1"
+emacs_archive_name="emacs-22.2.tar.gz"
+emacs_dir="emacs-22.2"
+emacs_version="22.2"
emacs_major="22"
deb_src_rev="1"
# man files which appear to be compatible with the DFSG
dfsg_man_files="
- dired-x.texi
faq.texi"
pushd "${emacs_dir}"
===================================================================
--- sid.orig/lisp/gnus/message.el
+++ sid/lisp/gnus/message.el
-@@ -4025,7 +4025,12 @@
+@@ -4026,7 +4026,12 @@
"/usr/lib/sendmail")
((file-exists-p "/usr/ucblib/sendmail")
"/usr/ucblib/sendmail")
===================================================================
--- sid.orig/lisp/startup.el
+++ sid/lisp/startup.el
-@@ -295,6 +295,10 @@
- (defvar pure-space-overflow nil
- "Non-nil if building Emacs overflowed pure space.")
+@@ -302,6 +302,10 @@
+ Warning Warning!!! Pure space overflow !!!Warning Warning
+ \(See the node Pure Storage in the Lisp manual for details.)\n")
+(defconst debian-emacs-flavor 'emacs22
+ "A symbol representing the particular debian flavor of emacs running.
(defun normal-top-level-add-subdirs-to-load-path ()
"Add all subdirectories of current directory to `load-path'.
More precisely, this uses only the subdirectories whose names
-@@ -815,8 +819,21 @@
- ;; Run the site-start library if it exists. The point of this file is
- ;; that it is run before .emacs. There is no point in doing this after
- ;; .emacs; that is useless.
+@@ -826,8 +830,21 @@
+ ;; be loaded from site-run-file and wants to test if -q was given
+ ;; should check init-file-user instead, since that is already set.
+ ;; See cus-edit.el for an example.
+- (if site-run-file
+- (load site-run-file t t))
+
+ ;; Original upstream startup
+ ;; (if site-run-file
+ ;;
+
+ ;; Debian startup
- (if site-run-file
-- (load site-run-file t t))
++ (if site-run-file
+ (progn
+ ;; Load all the debian package snippets.
+ ;; It's in here because we want -q to kill it too.
+ (load site-run-file t t nil)))
;; Sites should not disable this. Only individuals should disable
- ;; the startup message.
+ ;; the startup screen.
+++ /dev/null
-* A problem with auto save file name encoding has been fixed.
- Patch: fix-auto-save-file-name.diff
- Provided-by: Sven Joachim <svenjoac@gmx.de>
- Date: Sun, 02 Mar 2008 18:41:33 +0200
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: merged upstream
-
- Upstream changelog entry:
-
- 2008-02-26 Jason Rumney <jasonr@gnu.org>
-
- * files.el (make-auto-save-file-name): Encode more characters in
- non-file buffer names. Use url-encoding.
-
-Index: sid/lisp/files.el
-===================================================================
---- sid.orig/lisp/files.el
-+++ sid/lisp/files.el
-@@ -4510,15 +4510,18 @@
- (let ((buffer-name (buffer-name))
- (limit 0)
- file-name)
-- ;; Eliminate all slashes and backslashes by
-- ;; replacing them with sequences that start with %.
-- ;; Quote % also, to keep distinct names distinct.
-- (while (string-match "[/\\%]" buffer-name limit)
-+ ;; Restrict the characters used in the file name to those which
-+ ;; are known to be safe on all filesystems, url-encoding the
-+ ;; rest.
-+ ;; We do this on all platforms, because even if we are not
-+ ;; running on DOS/Windows, the current directory may be on a
-+ ;; mounted VFAT filesystem, such as a USB memory stick.
-+ (while (string-match "[^A-Za-z0-9-_.~#+]" buffer-name limit)
- (let* ((character (aref buffer-name (match-beginning 0)))
- (replacement
-- (cond ((eq character ?%) "%%")
-- ((eq character ?/) "%+")
-- ((eq character ?\\) "%-"))))
-+ ;; For multibyte characters, this will produce more than
-+ ;; 2 hex digits, so is not true URL encoding.
-+ (format "%%%02X" character)))
- (setq buffer-name (replace-match replacement t t buffer-name))
- (setq limit (1+ (match-end 0)))))
- ;; Generate the file name.
+++ /dev/null
-* A problem with the --no-bitmap-icon argument has been fixed.
- Patch: fix-bitmap-icon-arg.diff
- Provided-by: Sven Joachim <sven_joachim@web.de>
- Date: Sun, 22 Jul 2007 17:16:09 +0200
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: appears to be incorporated upstream
-
- Upstream changelog entry:
-
- 2007-07-22 Jan Djärv <jan.h.d@swipnet.se>
-
- * startup.el (command-line-x-option-alist): Use x-handle-no-bitmap-icon.
-
- * term/x-win.el (x-handle-no-bitmap-icon): New function.
-
-Index: sid/lisp/startup.el
-===================================================================
---- sid.orig/lisp/startup.el
-+++ sid/lisp/startup.el
-@@ -144,7 +144,7 @@
- ("--foreground-color" 1 x-handle-switch foreground-color)
- ("--background-color" 1 x-handle-switch background-color)
- ("--mouse-color" 1 x-handle-switch mouse-color)
-- ("--no-bitmap-icon" 0 x-handle-switch icon-type nil)
-+ ("--no-bitmap-icon" 0 x-handle-no-bitmap-icon)
- ("--iconic" 0 x-handle-iconic)
- ("--xrm" 1 x-handle-xrm-switch)
- ("--cursor-color" 1 x-handle-switch cursor-color)
-Index: sid/lisp/term/x-win.el
-===================================================================
---- sid.orig/lisp/term/x-win.el
-+++ sid/lisp/term/x-win.el
-@@ -129,6 +129,9 @@
- initial-frame-alist)
- x-invocation-args (cdr x-invocation-args)))))))
-
-+(defun x-handle-no-bitmap-icon (switch)
-+ (setq default-frame-alist (cons '(icon-type) default-frame-alist)))
-+
- ;; Make -iconic apply only to the initial frame!
- (defun x-handle-iconic (switch)
- (setq initial-frame-alist
+++ /dev/null
-* A problem with cc-mode and file local variables has been fixed.
- Patch: fix-cc-mode-local-vars.diff
- Provided-by: Sven Joachim <sven_joachim@web.de>
- Date: Wed, 20 Jun 2007 15:36:23 +0200
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: appears to be incorporated upstream
-
- Upstream changelog entry:
-
- 2007-06-18 Alan Mackenzie <acm@muc.de>
-
- * progmodes/cc-mode.el (c-remove-any-local-eval-or-mode-variables):
- When removing lines, also remove the \n. Correction of patch of
- 2007-04-21.
-
-Index: sid/lisp/progmodes/cc-mode.el
-===================================================================
---- sid.orig/lisp/progmodes/cc-mode.el
-+++ sid/lisp/progmodes/cc-mode.el
-@@ -790,7 +790,8 @@
- ;; If the buffer specifies `mode' or `eval' in its File Local Variable list
- ;; or on the first line, remove all occurrences. See
- ;; `c-postprocess-file-styles' for justification. There is no need to save
-- ;; point here, or even bother too much about the buffer contents.
-+ ;; point here, or even bother too much about the buffer contents. However,
-+ ;; DON'T mess up the kill-ring.
- ;;
- ;; Most of the code here is derived from Emacs 21.3's `hack-local-variables'
- ;; in files.el.
-@@ -819,8 +820,8 @@
- (regexp-quote suffix)
- "$")
- nil t)
-- (beginning-of-line)
-- (delete-region (point) (progn (end-of-line) (point)))))
-+ (forward-line 0)
-+ (delete-region (point) (progn (forward-line) (point)))))
-
- ;; Delete the first line, if we've got one, in case it contains a mode spec.
- (unless (and lv-point
-@@ -828,7 +829,8 @@
- (forward-line 0)
- (bobp)))
- (goto-char (point-min))
-- (delete-region (point) (progn (end-of-line) (point))))))
-+ (unless (eobp)
-+ (delete-region (point) (progn (forward-line) (point)))))))
-
- (defun c-postprocess-file-styles ()
- "Function that post processes relevant file local variables in CC Mode.
+++ /dev/null
-* The emacs manpage has been updated.
- Patch: fix-emacs-manpage.diff
- Provided-by: Sven Joachim <sven_joachim@web.de>
- Date: Sun, 15 Jul 2007 08:48:53 +0200
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: appears to be incorporated upstream
-
- In addition to the upstream changes, the page has been adjusted for
- Debian.
-
- Upstream changelog entry:
-
- 2007-07-15 Werner Lemberg <wl@gnu.org>
-
- * emacs.1: Completely revised.
- Fix many typographical glitches.
- Updated to handle current state of options and resources.
-
-Index: sid/etc/emacs.1
-===================================================================
---- sid.orig/etc/emacs.1
-+++ sid/etc/emacs.1
-@@ -1,3 +1,4 @@
-+'\" t
- .\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004,
- .\" 2005, 2006, 2007 Free Software Foundation, Inc.
- .\"
-@@ -20,27 +21,33 @@
- .\"
- '\" t
- .TH EMACS 1 "2007 April 13" "GNU Emacs 22.1"
-+.
-+.
- .SH NAME
- emacs \- GNU project Emacs
-+.
-+.
- .SH SYNOPSIS
- .B emacs
- [
- .I command-line switches
- ] [
--.I files ...
-+.I files ...\&
- ]
--.br
-+.
-+.
- .SH DESCRIPTION
- .I GNU Emacs
- is a version of
--.I Emacs,
-+.IR Emacs ,
- written by the author of the original (PDP-10)
--.I Emacs,
-+.IR Emacs ,
- Richard Stallman.
- .br
- The primary documentation of GNU Emacs is in the GNU Emacs Manual,
- which you can read using Info, either from Emacs or as a standalone
--program. Please look there for complete and up-to-date documentation.
-+program.
-+Please look there for complete and up-to-date documentation.
- This man page is updated only when someone volunteers to do so; the
- Emacs maintainers' priority goal is to minimize the amount of time
- this man page takes away from other more useful projects.
-@@ -56,9 +63,9 @@
- but the facility assumes that you know how to manipulate
- .I Emacs
- windows and buffers.
--CTRL-h or F1 enters the Help facility. Help Tutorial (CTRL-h t)
--starts an interactive tutorial which can teach beginners the fundamentals
--of
-+CTRL-h or F1 enters the Help facility.
-+Help Tutorial (CTRL-h t) starts an interactive tutorial which can
-+teach beginners the fundamentals of
- .I Emacs
- in a few minutes.
- Help Apropos (CTRL-h a) helps you
-@@ -66,11 +73,11 @@
- describes a given character's effect, and Help Function (CTRL-h f)
- describes a given Lisp function specified by name.
- .PP
--.I Emacs's
-+.IR Emacs 's
- Undo can undo several steps of modification to your buffers, so it is
- easy to recover from editing mistakes.
- .PP
--.I GNU Emacs's
-+.IR "GNU Emacs" 's
- many special packages handle mail reading (RMail) and sending (Mail),
- outline editing (Outline), compiling (Compile), running subshells
- within
-@@ -81,218 +88,299 @@
- There is an extensive reference manual, but
- users of other Emacses
- should have little trouble adapting even
--without a copy. Users new to
-+without a copy.
-+Users new to
- .I Emacs
- will be able
- to use basic features fairly rapidly by studying the tutorial and
- using the self-documentation features.
--.PP
--.SM Emacs Options
--.PP
-+.
-+.SS Emacs Options
- The following options are of general interest:
-+.RS
- .TP 8
- .I file
- Edit
--.I file.
-+.IR file .
- .TP
--.BI \+ number
-+.BI \-\-file " file\fR,\fP " \-\-find-file " file\fR,\fP " \-\-visit " file"
-+The same as specifying
-+.I file
-+directly as an argument.
-+.TP
-+.BI + number
- Go to the line specified by
- .I number
- (do not insert a space between the "+" sign and
--the number). This applies only to the next file specified.
-+the number).
-+This applies only to the next file specified.
- .TP
--.BI \+ line:column
-+.BI + line:column
- Go to the specified
- .I line
- and
--.I column
-+.IR column .
- .TP
--.B \-q
-+.BR \-q ", " \-\-no\-init\-file
- Do not load an init file.
- .TP
--.B \-no-site-file
-+.B \-\-no\-site\-file
- Do not load the site-wide startup file.
- .TP
--.BI \-debug-init
-+.B \-\-no\-desktop
-+Do not load a saved desktop.
-+.TP
-+.BR \-nl ", " \-\-no\-shared\-memory
-+Do not use shared memory.
-+.TP
-+.BR \-Q ", " \-\-quick
-+Equivalent to "\-q \-\-no\-site\-file \-\-no\-splash".
-+.TP
-+.B \-\-no\-splash
-+Do not display a splash screen during start-up.
-+.TP
-+.B \-\-debug\-init
- Enable
- .I Emacs
- Lisp debugger during the processing of the user init file
--.BI ~/.emacs.
-+.BR ~/.emacs .
- This is useful for debugging problems in the init file.
- .TP
--.BI \-u " user"
-+.BI \-u " user\fR,\fP " \-\-user " user"
- Load
--.I user's
-+.IR user 's
- init file.
- .TP
--.BI \-t " file"
-+.BI \-t " file\fR,\fP " \-\-terminal " file"
- Use specified
- .I file
- as the terminal instead of using stdin/stdout.
- This must be the first argument specified in the command line.
- .TP
--.B \-version
-+.BR \-\-multibyte ", " \-\-no-unibyte
-+Enable multibyte mode (enabled by default).
-+.TP
-+.BR \-\-unibyte ", " \-\-no-multibyte
-+Enable unibyte mode.
-+.TP
-+.B \-\-version
- Display
- .I Emacs
- version information and exit.
-+.TP
-+.B \-\-help
-+Display this help and exit.
-+.RE
- .PP
- The following options are lisp-oriented
- (these options are processed in the order encountered):
-+.RS
- .TP 8
--.BI \-f " function"
-+.BI \-f " function\fR,\fP " \-\-funcall " function"
- Execute the lisp function
--.I function.
-+.IR function .
- .TP
--.BI \-l " file"
-+.BI \-l " file\fR,\fP " \-\-load " file"
- Load the lisp code in the file
--.I file.
-+.IR file .
- .TP
--.BI \-eval " expr"
-+.BI \-\-eval " expr\fR,\fP " \-\-execute " expr"
- Evaluate the Lisp expression
--.I expr.
-+.IR expr .
-+.RE
- .PP
- The following options are useful when running
- .I Emacs
- as a batch editor:
-+.RS
- .TP 8
--.BI \-batch
--Edit in batch mode. The editor will send messages to stderr. This
--option must be the first in the argument list. You must use \-l and \-f
--options to specify files to execute and functions to call.
-+.B \-\-batch
-+Edit in batch mode.
-+The editor will send messages to stderr.
-+This option must be the first in the argument list.
-+You must use \-l and \-f options to specify files to execute
-+and functions to call.
-+.TP
-+.BI \-\-script " file"
-+Run
-+.I file
-+as an Emacs Lisp script.
-+.TP
-+.BI \-\-insert " file"
-+Insert contents of
-+.I file
-+into the current buffer.
- .TP
--.B \-kill
-+.B \-\-kill
- Exit
- .I Emacs
- while in batch mode.
- .TP
--.BI \-L " directory"
-+.BI \-L " dir\fR,\fP " \-\-directory " dir"
- Add
--.I directory
-+.I dir
- to the list of directories
- .I Emacs
- searches for Lisp files.
-+.RE
-+.
- .\" START DELETING HERE IF YOU'RE NOT USING X
--.PP
--.SM Using Emacs with X
--.PP
-+.SS Using Emacs with X
- .I Emacs
- has been tailored to work well with the X window system.
- If you run
- .I Emacs
- from under X windows, it will create its own X window to
--display in. You will probably want to start the editor
--as a background process
--so that you can continue using your original window.
-+display in.
-+You will probably want to start the editor as a background
-+process so that you can continue using your original window.
- .PP
- .I Emacs
- can be started with the following X switches:
-+.RS
- .TP 8
--.BI \-name " name"
--Specifies the name which should be assigned to the initial
-+.BI \-\-name " name"
-+Specify the name which should be assigned to the initial
- .I Emacs
--window. This controls looking up X resources as well as the window title.
--.TP 8
--.BI \-title " name"
--Specifies the title for the initial X window.
--.TP 8
--.B \-r
-+window.
-+This controls looking up X resources as well as the window title.
-+.TP
-+.BI \-T " name\fR,\fP " \-\-title " name"
-+Specify the title for the initial X window.
-+.TP
-+.BR \-r ", " \-rv ", " \-\-reverse\-video
- Display the
- .I Emacs
- window in reverse video.
- .TP
--.BI \-font " font, " \-fn " font"
-+.BI \-fn " font\fR,\fP " \-\-font " font"
- Set the
- .I Emacs
- window's font to that specified by
--.I font.
-+.IR font .
- You will find the various
- .I X
- fonts in the
--.I /usr/lib/X11/fonts
-+.I /usr/share/fonts/X11
- directory.
- Note that
- .I Emacs
- will only accept fixed width fonts.
- Under the X11 Release 4 font-naming conventions, any font with the
- value "m" or "c" in the eleventh field of the font name is a fixed
--width font. Furthermore, fonts whose name are of the form
-+width font.
-+Furthermore, fonts whose name are of the form
- .IR width x height
- are generally fixed width, as is the font
- .IR fixed .
- See
--.IR xlsfonts (1)
-+.BR xlsfonts (1)
- for more information.
-
- When you specify a font, be sure to put a space between the
- switch and the font name.
- .TP
--.BI \-bw " pixels"
-+.BI \-\-xrm " resources"
-+Set additional X resources.
-+.TP
-+.BI "\-\-color\fR,\fP \-\-color=" mode
-+Override color mode for character terminals;
-+.I mode
-+defaults to `auto', and can also be `never', `auto', `always',
-+or a mode name like `ansi8'.
-+.TP
-+.BI \-bw " pixels\fR,\fP " \-\-border\-width " pixels"
- Set the
- .I Emacs
- window's border width to the number of pixels specified by
--.I pixels.
-+.IR pixels .
- Defaults to one pixel on each side of the window.
- .TP
--.BI \-ib " pixels"
-+.BI \-ib " pixels\fR,\fP " \-\-internal\-border " pixels"
- Set the window's internal border width to the number of pixels specified
- by
--.I pixels.
-+.IR pixels .
- Defaults to one pixel of padding on each side of the window.
--.PP
--.TP 8
--.BI \-\-geometry " geometry"
-+.TP
-+.BI \-g " geometry\fR,\fP " \-\-geometry " geometry"
- Set the
- .I Emacs
--window's width, height, and position as specified. The geometry
--specification is in the standard X format; see
--.IR X (1)
-+window's width, height, and position as specified.
-+The geometry specification is in the standard X format; see
-+.BR X (7)
- for more information.
--The width and height are specified in characters; the default is 80 by
--24. See the Emacs manual, section "Options for Window Size and Position",
-+The width and height are specified in characters; the default is
-+80 by 24.
-+See the Emacs manual, section "Options for Window Size and Position",
- for information on how window sizes interact
- with selecting or deselecting the tool bar and menu bar.
--.PP
--.TP 8
--.BI \-fg " color"
--On color displays, sets the color of the text.
-+.TP
-+.BI \-lsp " pixels\fR,\fP " \-\-line\-spacing " pixels"
-+Additional space to put between lines.
-+.TP
-+.BR \-vb ", " \-\-vertical\-scroll\-bars
-+Enable vertical scrollbars.
-+.TP
-+.BR \-fh ", " \-\-fullheight
-+Make the first frame as high as the screen.
-+.TP
-+.BR \-fs ", " \-\-fullscreen
-+Make the first frame fullscreen.
-+.TP
-+.BR \-fw ", " \-\-fullwidth
-+Make the first frame as wide as the screen.
-+.TP
-+.BI \-fg " color\fR,\fP " \-\-foreground\-color " color"
-+On color displays, set the color of the text.
-
- Use the command
--.I M-x list-colors-display
--for a list of valid
--color names.
--.TP
--.BI \-bg " color"
--On color displays,
--sets the color of the window's background.
-+.I M\-x list\-colors\-display
-+for a list of valid color names.
- .TP
--.BI \-bd " color"
--On color displays,
--sets the color of the window's border.
-+.BI \-bg " color\fR,\fP " \-\-background\-color " color"
-+On color displays, set the color of the window's background.
- .TP
--.BI \-cr " color"
--On color displays,
--sets the color of the window's text cursor.
-+.BI \-bd " color\fR,\fP " \-\-border\-color " color"
-+On color displays, set the color of the window's border.
- .TP
--.BI \-ms " color"
--On color displays,
--sets the color of the window's mouse cursor.
-+.BI \-cr " color\fR,\fP " \-\-cursor\-color " color"
-+On color displays, set the color of the window's text cursor.
-+.TP
-+.BI \-ms " color\fR,\fP " \-\-mouse\-color " color"
-+On color displays, set the color of the window's mouse cursor.
- .TP
--.BI \-d " displayname, " \-display " displayname"
-+.BI \-d " displayname\fR,\fP " \-\-display " displayname"
- Create the
- .I Emacs
- window on the display specified by
- .IR displayname .
- Must be the first option specified in the command line.
- .TP
--.B \-nw
--Tells
-+.BR \-nbi ", " \-\-no\-bitmap\-icon
-+Do not use picture of gnu for Emacs icon.
-+.TP
-+.B \-\-iconic
-+Start
- .I Emacs
--not to use its special interface to X. If you use this
--switch when invoking
-+in iconified state.
-+.TP
-+.BR \-nbc ", " \-\-no\-blinking\-cursor
-+Disable blinking cursor.
-+.TP
-+.BR \-nw ", " \-\-no\-window\-system
-+Tell
-+.I Emacs
-+not to use its special interface to X.
-+If you use this switch when invoking
- .I Emacs
- from an
--.IR xterm (1)
-+.BR xterm (1)
- window, display is done in that window.
-+.TP
-+.BR \-D ", " \-\-basic\-display
-+This option disables many display features; use it for
-+debugging Emacs.
-+.RE
- .PP
- You can set
- .I X
-@@ -301,75 +389,185 @@
- windows in your
- .I \.Xresources
- file (see
--.IR xrdb (1)).
-+.BR xrdb (1)).
- Use the following format:
- .IP
--emacs.keyword:value
-+.RI emacs. keyword : value
- .PP
- where
- .I value
- specifies the default value of
--.I keyword.
-+.IR keyword .
- .I Emacs
- lets you set default values for the following keywords:
-+.RS
- .TP 8
--.B font (\fPclass\fB Font)
--Sets the window's text font.
--.TP
--.B reverseVideo (\fPclass\fB ReverseVideo)
--If
--.I reverseVideo's
--value is set to
--.I on,
--the window will be displayed in reverse video.
-+.BR background " (class " Background )
-+For color displays,
-+sets the window's background color.
- .TP
--.B bitmapIcon (\fPclass\fB BitmapIcon)
-+.BR bitmapIcon " (class " BitmapIcon )
- If
--.I bitmapIcon's
-+.BR bitmapIcon 's
- value is set to
--.I on,
-+.IR on ,
- the window will iconify into the "kitchen sink."
- .TP
--.B borderWidth (\fPclass\fB BorderWidth)
--Sets the window's border width in pixels.
-+.BR borderColor " (class " BorderColor )
-+For color displays,
-+sets the color of the window's border.
- .TP
--.B internalBorder (\fPclass\fB BorderWidth)
--Sets the window's internal border width in pixels.
-+.BR borderWidth " (class " BorderWidth )
-+Sets the window's border width in pixels.
- .TP
--.B foreground (\fPclass\fB Foreground)
-+.BR cursorColor " (class " Foreground )
- For color displays,
--sets the window's text color.
-+sets the color of the window's text cursor.
- .TP
--.B background (\fPclass\fB Background)
--For color displays,
--sets the window's background color.
-+.BR cursorBlink " (class " CursorBlink )
-+Specifies whether to make the cursor blink.
-+The default is
-+.IR on .
-+Use
-+.I off
-+or
-+.I false
-+to turn cursor blinking off.
- .TP
--.B borderColor (\fPclass\fB BorderColor)
--For color displays,
--sets the color of the window's border.
-+.BR font " (class " Font )
-+Sets the window's text font.
- .TP
--.B cursorColor (\fPclass\fB Foreground)
-+.BR foreground " (class " Foreground )
- For color displays,
--sets the color of the window's text cursor.
-+sets the window's text color.
- .TP
--.B pointerColor (\fPclass\fB Foreground)
--For color displays,
--sets the color of the window's mouse cursor.
-+.BR fullscreen " (class " Fullscreen )
-+The desired fullscreen size.
-+The value can be one of
-+.IR fullboth ,
-+.IR fullwidth ,
-+or
-+.IR fullheight ,
-+which correspond to the command-line options `\-fs', `\-fw', and
-+`\-fh', respectively.
-+Note that this applies to the initial frame only.
- .TP
--.B geometry (\fPclass\fB Geometry)
-+.BR geometry " (class " Geometry )
- Sets the geometry of the
- .I Emacs
- window (as described above).
- .TP
--.B title (\fPclass\fB Title)
-+.BR iconName " (class " Title )
-+Sets the icon name for the
-+.I Emacs
-+window icon.
-+.TP
-+.BR internalBorder " (class " BorderWidth )
-+Sets the window's internal border width in pixels.
-+.TP
-+.BR lineSpacing " (class " LineSpacing )
-+Additional space ("leading") between lines, in pixels.
-+.TP
-+.BR menuBar " (class " MenuBar )
-+Gives frames menu bars if
-+.IR on ;
-+don't have menu bars if
-+.IR off .
-+See the Emacs manual, sections "Lucid Resources" and "LessTif
-+Resources", for how to control the appearance of the menu bar
-+if you have one.
-+.TP
-+.BR minibuffer " (class " Minibuffer )
-+If
-+.IR none ,
-+don't make a minibuffer in this frame.
-+It will use a separate minibuffer frame instead.
-+.TP
-+.BR paneFont " (class " Font )
-+Font name for menu pane titles, in non-toolkit versions of
-+.IR Emacs .
-+.TP
-+.BR pointerColor " (class " Foreground )
-+For color displays,
-+sets the color of the window's mouse cursor.
-+.TP
-+.BR privateColormap " (class " PrivateColormap )
-+If
-+.IR on ,
-+use a private color map, in the case where the "default
-+visual" of class
-+.B PseudoColor
-+and
-+.B Emacs
-+is using it.
-+.TP
-+.BR reverseVideo " (class " ReverseVideo )
-+If
-+.BR reverseVideo 's
-+value is set to
-+.IR on ,
-+the window will be displayed in reverse video.
-+.TP
-+.BR screenGamma " (class "ScreenGamma )
-+Gamma correction for colors, equivalent to the frame parameter
-+`screen\-gamma'.
-+.TP
-+.BR scrollBarWidth " (class "ScrollBarWidth )
-+The scroll bar width in pixels, equivalent to the frame parameter
-+`scroll\-bar\-width'.
-+.TP
-+.BR selectionFont " (class " SelectionFont )
-+Font name for pop-up menu items, in non-toolkit versions of
-+.IR Emacs .
-+(For toolkit versions, see the Emacs manual, sections
-+"Lucid Resources" and "LessTif Resources".)
-+.TP
-+.BR selectionTimeout " (class " SelectionTimeout )
-+Number of milliseconds to wait for a selection reply.
-+A value of 0 means wait as long as necessary.
-+.TP
-+.BR synchronous " (class " Synchronous )
-+Run Emacs in synchronous mode if
-+.IR on .
-+Synchronous mode is useful for debugging X problems.
-+.TP
-+.BR title " (class " Title )
- Sets the title of the
- .I Emacs
- window.
- .TP
--.B iconName (\fPclass\fB Title)
--Sets the icon name for the
--.I Emacs
--window icon.
-+.BR toolBar " (class " ToolBar )
-+Number of lines to reserve for the tool bar.
-+.TP
-+.BR useXIM " (class " UseXIM )
-+Turns off use of X input methods (XIM) if
-+.I false
-+or
-+.IR off .
-+.TP
-+.BR verticalScrollBars " (class " ScrollBars )
-+Gives frames scroll bars if
-+.IR on ;
-+suppresses scroll bars if
-+.IR off .
-+.TP
-+.BR visualClass " (class " VisualClass )
-+Specify the "visual" that X should use.
-+This tells X how to handle colors.
-+The value should start with one of
-+.IR TrueColor ,
-+.IR PseudoColor ,
-+.IR DirectColor ,
-+.IR StaticColor ,
-+.IR GrayScale ,
-+and
-+.IR StaticGray ,
-+followed by
-+.BI \- depth\fR,\fP
-+where
-+.I depth
-+is the number of color planes.
-+.RE
- .PP
- If you try to set color values while using a black and white display,
- the window's characteristics will default as follows:
-@@ -377,14 +575,17 @@
- the background color will be set to white,
- the border color will be set to grey,
- and the text and mouse cursors will be set to black.
-+.
-+.SS Using the Mouse
- .PP
--.SM Using the Mouse
--.PP
--The following lists the mouse button bindings for the
-+The following lists some of the mouse button bindings for the
- .I Emacs
- window under X11.
--
-+.
-+.RS
- .TS
-+l l
-+- -
- l l.
- MOUSE BUTTON FUNCTION
- left Set point.
-@@ -394,83 +595,93 @@
- SHIFT-right Paste text.
- CTRL-middle Cut text into X cut buffer and kill it.
- CTRL-right T{
--Select this window, then split it into
--two windows. Same as typing CTRL-x 2.
-+Select this window, then split it into two windows.
-+Same as typing CTRL\-x 2.
- T}
- .\" START DELETING HERE IF YOU'RE NOT USING X MENUS
- CTRL-SHIFT-left T{
- X buffer menu \(em hold the buttons and keys
--down, wait for menu to appear, select
--buffer, and release. Move mouse out of
--menu and release to cancel.
-+down, wait for menu to appear, select buffer, and release.
-+Move mouse out of menu and release to cancel.
-+T}
-+CTRL-SHIFT-middle T{
-+X help menu \(em pop up index card menu for Emacs help.
- T}
--CTRL-SHIFT-middle X help menu \(em pop up index card menu for Emacs help.
- .\" STOP DELETING HERE IF YOU'RE NOT USING X MENUS
- CTRL-SHIFT-right T{
--Select window with mouse, and delete all
--other windows. Same as typing CTRL-x 1.
-+Select window with mouse, and delete all other windows.
-+Same as typing CTRL\-x 1.
- T}
- .\" STOP DELETING HERE IF YOU'RE NOT USING X
- .TE
--.PP
-+.RE
-+.
-+.
- .SH MANUALS
- You can order printed copies of the GNU Emacs Manual from the Free
--Software Foundation, which develops GNU software. See the file ORDERS
--for ordering information.
-+Software Foundation, which develops GNU software.
-+See the file ORDERS for ordering information.
- .br
--Your local Emacs maintainer might also have copies available. As
--with all software and publications from FSF, everyone is permitted to
--make and distribute copies of the Emacs manual. The TeX source to the
--manual is also included in the Emacs source distribution.
--.PP
-+Your local Emacs maintainer might also have copies available.
-+As with all software and publications from FSF, everyone is permitted
-+to make and distribute copies of the Emacs manual.
-+The TeX source to the manual is also included in the Emacs source
-+distribution.
-+.
-+.
- .SH FILES
--/usr/local/share/info - files for the Info documentation browser.
-+/usr/share/info \(em files for the Info documentation browser.
- The complete text of the Emacs reference manual is included in a
--convenient tree structured form. Also includes the Emacs Lisp
--Reference Manual, useful to anyone wishing to write programs in the
--Emacs Lisp extension language.
--
--/usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
--that define most editing commands. Some are preloaded;
--others are autoloaded from this directory when used.
-+convenient tree structured form.
-+Also includes the Emacs Lisp Reference Manual, useful to anyone
-+wishing to write programs in the Emacs Lisp extension language.
-+
-+/usr/share/emacs/$VERSION/lisp \(em Lisp source files and
-+compiled files that define most editing commands.
-+Some are preloaded; others are autoloaded from this directory when
-+used.
-
--/usr/local/libexec/emacs/$VERSION/$ARCH - various programs that are
-+/usr/lib/emacs/$VERSION/$ARCH \(em various programs that are
- used with GNU Emacs.
-
--/usr/local/share/emacs/$VERSION/etc - various files of information.
-+/usr/share/emacs/$VERSION/etc \(em various files of information.
-
--/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation
-+/usr/share/emacs/$VERSION/etc/DOC.* \(em contains the documentation
- strings for the Lisp primitives and preloaded Lisp functions
--of GNU Emacs. They are stored here to reduce the size of
--Emacs proper.
-+of GNU Emacs.
-+They are stored here to reduce the size of Emacs proper.
-
--.br
--/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
-+/usr/share/emacs/$VERSION/etc/SERVICE lists people offering
- various services to assist users of GNU Emacs, including education,
- troubleshooting, porting and customization.
--
--.PP
-+.
-+.
- .SH BUGS
- There is a mailing list, bug-gnu-emacs@gnu.org, for reporting Emacs
--bugs and fixes. But before reporting something as a bug, please try
--to be sure that it really is a bug, not a misunderstanding or a
--deliberate feature. We ask you to read the section ``Reporting Emacs
--Bugs'' near the end of the reference manual (or Info system) for hints
--on how and when to report bugs. Also, include the version number of
--the Emacs you are running in \fIevery\fR bug report that you send in.
--
--Do not expect a personal answer to a bug report. The purpose of reporting
--bugs is to get them fixed for everyone in the next release, if possible.
-+bugs and fixes.
-+But before reporting something as a bug, please try to be sure that
-+it really is a bug, not a misunderstanding or a deliberate feature.
-+We ask you to read the section ``Reporting Emacs Bugs'' near the
-+end of the reference manual (or Info system) for hints on how and
-+when to report bugs.
-+Also, include the version number of the Emacs you are running in
-+\fIevery\fR bug report that you send in.
-+
-+Do not expect a personal answer to a bug report.
-+The purpose of reporting bugs is to get them fixed for everyone
-+in the next release, if possible.
- For personal assistance, look in the SERVICE file (see above) for
- a list of people who offer it.
-
- Please do not send anything but bug reports to this mailing list.
- For more information about Emacs mailing lists, see the
--file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be
--fixed if they can be isolated, so it is in your interest to report
--them in such a way that they can be easily reproduced.
-+file /usr/share/emacs/$VERSION/etc/MAILINGLISTS.
-+Bugs tend actually to be fixed if they can be isolated, so it is
-+in your interest to report them in such a way that they can be
-+easily reproduced.
-+.
-+.
- .SH UNRESTRICTIONS
--.PP
- .I Emacs
- is free; anyone may redistribute copies of
- .I Emacs
-@@ -487,25 +698,37 @@
- .I Emacs
- may sometimes be received packaged with distributions of Unix systems,
- but it is never included in the scope of any license covering those
--systems. Such inclusion violates the terms on which distribution
--is permitted. In fact, the primary purpose of the General Public
--License is to prohibit anyone from attaching any other restrictions
--to redistribution of
--.I Emacs.
-+systems.
-+Such inclusion violates the terms on which distribution is permitted.
-+In fact, the primary purpose of the General Public License is to
-+prohibit anyone from attaching any other restrictions to
-+redistribution of
-+.IR Emacs .
- .PP
- Richard Stallman encourages you to improve and extend
--.I Emacs,
-+.IR Emacs ,
- and urges that
--you contribute your extensions to the GNU library. Eventually GNU
--(Gnu's Not Unix) will be a complete replacement for Unix.
-+you contribute your extensions to the GNU library.
-+Eventually GNU (Gnu's Not Unix) will be a complete replacement
-+for Unix.
- Everyone will be free to use, copy, study and change the GNU system.
-+.
-+.
- .SH SEE ALSO
--emacsclient(1), etags(1), X(1), xlsfonts(1), xterm(1), xrdb(1)
-+.BR emacsclient (1),
-+.BR etags (1),
-+.BR X (7),
-+.BR xlsfonts (1),
-+.BR xterm (1),
-+.BR xrdb (1)
-+.
-+.
- .SH AUTHORS
--.PP
- .I Emacs
- was written by Richard Stallman and the Free Software Foundation.
- Joachim Martillo and Robert Krawitz added the X features.
-+.
-+.
- .SH COPYING
- Copyright
- .if t \(co
-@@ -526,5 +749,5 @@
- document into another language, under the above conditions for
- modified versions, except that this permission notice may be stated
- in a translation approved by the Free Software Foundation.
--
-+.
- .\" arch-tag: 04dfd376-b46e-4924-919a-cecc3b257eaa
+++ /dev/null
-* A stack overflow in the format function has been fixed.
- Patch: fix-format-overflow-cve-2007-6109.diff
- Provided-by: Nico Golde <nion@debian.org>
- Date: Mon, 10 Dec 2007 02:54:44 +0100
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: incorporated upstream
-
- A stack-based buffer overflow in the format function has been fixed,
- one that could lead to arbitrary code execution. The overflow could
- happen when dealing with high precision values (CVE-2007-6109).
-
-Index: sid/src/editfns.c
-===================================================================
---- sid.orig/src/editfns.c
-+++ sid/src/editfns.c
-@@ -3543,8 +3543,10 @@
- precision[n+1] = 10 * precision[n+1] + *format - '0';
- }
-
-- if (format - this_format_start + 1 > longest_format)
-- longest_format = format - this_format_start + 1;
-+ /* Extra +1 for 'l' that we may need to insert into the
-+ format. */
-+ if (format - this_format_start + 2 > longest_format)
-+ longest_format = format - this_format_start + 2;
-
- if (format == end)
- error ("Format string ends in middle of format specifier");
-@@ -3605,7 +3607,7 @@
- && *format != 'i' && *format != 'X' && *format != 'c')
- error ("Invalid format operation %%%c", *format);
-
-- thissize = 30;
-+ thissize = 30 + (precision[n] > 0 ? precision[n] : 0);
- if (*format == 'c')
- {
- if (! SINGLE_BYTE_CHAR_P (XINT (args[n]))
-@@ -3803,23 +3805,39 @@
- format - this_format_start);
- this_format[format - this_format_start] = 0;
-
-- if (INTEGERP (args[n]))
-+ if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
-+ sprintf (p, this_format, XFLOAT_DATA (args[n]));
-+ else
- {
-- if (format[-1] == 'd')
-- sprintf (p, this_format, XINT (args[n]));
-- /* Don't sign-extend for octal or hex printing. */
-+ if (sizeof (EMACS_INT) > sizeof (int) && format[-1] != 'c')
-+ {
-+ /* Insert 'l' before format spec. */
-+ this_format[format - this_format_start]
-+ = this_format[format - this_format_start - 1];
-+ this_format[format - this_format_start - 1] = 'l';
-+ this_format[format - this_format_start + 1] = 0;
-+ }
-+
-+ if (INTEGERP (args[n]))
-+ {
-+ if (format[-1] == 'c')
-+ sprintf (p, this_format, (int) XINT (args[n]));
-+ else if (format[-1] == 'd')
-+ sprintf (p, this_format, XINT (args[n]));
-+ /* Don't sign-extend for octal or hex printing. */
-+ else
-+ sprintf (p, this_format, XUINT (args[n]));
-+ }
-+ else if (format[-1] == 'c')
-+ sprintf (p, this_format, (int) XFLOAT_DATA (args[n]));
-+ else if (format[-1] == 'd')
-+ /* Maybe we should use "%1.0f" instead so it also works
-+ for values larger than MAXINT. */
-+ sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
- else
-- sprintf (p, this_format, XUINT (args[n]));
-+ /* Don't sign-extend for octal or hex printing. */
-+ sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
- }
-- else if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
-- sprintf (p, this_format, XFLOAT_DATA (args[n]));
-- else if (format[-1] == 'd')
-- /* Maybe we should use "%1.0f" instead so it also works
-- for values larger than MAXINT. */
-- sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
-- else
-- /* Don't sign-extend for octal or hex printing. */
-- sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
-
- if (p > buf
- && multibyte
+++ /dev/null
-* A security vulnerability in the handling of local variables has been fixed.
- Patch: cve-2007-5795.diff
- Provided-by: Drake Wilson <drake@begriffli.ch>
- Date: Sat Nov 24 00:39:36 UTC 2007
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: merged upstream
-
- Upstream changelog entry:
-
- 2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change)
-
- * files.el (hack-local-variables): Fix membership tests to avoid
- treating all variables as safe if `enable-local-variables' is
- set to :safe.
-
---- a/lisp/files.el
-+++ b/lisp/files.el
-@@ -2736,8 +2736,8 @@
- ;; If caller wants only the safe variables,
- ;; install only them.
- (dolist (elt result)
-- (unless (or (memq (car elt) unsafe-vars)
-- (memq (car elt) risky-vars))
-+ (unless (or (member elt unsafe-vars)
-+ (member elt risky-vars))
- (hack-one-local-variable (car elt) (cdr elt))))
- ;; Query, except in the case where all are known safe
- ;; if the user wants no quuery in that case.
+++ /dev/null
-* The switch-to-buffer-other-frame function now returns the new buffer.
- Patch: fix-switch-to-buffer-other-frame.diff
- Provided-by: Sven Joachim <svenjoac@gmx.de>
- Date: Sun, 23 Dec 2007 17:44:08 +0100
- Added-by: Rob Browning <rlb@defaultvalue.org>
- Status: merged upstream
-
- This also means that find-file-read-only-other-frame will now
- correctly mark the new buffer as read only.
-
- Upstream changelog entry:
-
- 2007-12-23 Andreas Schwab <schwab@suse.de>
-
- * files.el (switch-to-buffer-other-frame): Return the buffer
- switched to.
-
-Index: sid/lisp/files.el
-===================================================================
---- sid.orig/lisp/files.el
-+++ sid/lisp/files.el
-@@ -1006,14 +1006,16 @@
- "Switch to buffer BUFFER in another frame.
- Optional second arg NORECORD non-nil means
- do not put this buffer at the front of the list of recently selected ones.
-+This function returns the buffer it switched to.
-
- This uses the function `display-buffer' as a subroutine; see its
- documentation for additional customization information."
- (interactive "BSwitch to buffer in other frame: ")
- (let ((pop-up-frames t)
- same-window-buffer-names same-window-regexps)
-- (pop-to-buffer buffer t norecord)
-- (raise-frame (window-frame (selected-window)))))
-+ (prog1
-+ (pop-to-buffer buffer t norecord)
-+ (raise-frame (window-frame (selected-window))))))
-
- (defun display-buffer-other-frame (buffer)
- "Switch to buffer BUFFER in another frame.
===================================================================
--- sid.orig/lisp/vc-hooks.el
+++ sid/lisp/vc-hooks.el
-@@ -75,8 +75,8 @@
+@@ -77,8 +77,8 @@
:group 'vc)
(defcustom vc-path
===================================================================
--- sid.orig/lisp/help.el
+++ sid/lisp/help.el
-@@ -279,6 +279,14 @@
+@@ -281,6 +281,14 @@
\f
;;; `User' help functions
(defun describe-distribution ()
"Display info on how to obtain the latest version of GNU Emacs."
(interactive)
-@@ -293,7 +301,7 @@
- (defun describe-project ()
+@@ -295,7 +303,7 @@
+ (defun describe-gnu-project ()
"Display info on the GNU project."
(interactive)
- (view-file (expand-file-name "THE-GNU-PROJECT" data-directory))
+ (view-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT" data-directory))
(goto-char (point-min)))
- (defun describe-no-warranty ()
+ (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
Index: sid/Makefile.in
===================================================================
--- sid.orig/Makefile.in
+++ sid/Makefile.in
-@@ -138,11 +138,7 @@
+@@ -139,11 +139,7 @@
# since there are now many packages documented with the texinfo
# system, it is inappropriate to imply that it is part of Emacs.
infodir=@infodir@
- forms gnus idlwave info message mh-e newsticker org pcl-cvs \
- pgg reftex sc ses sieve speedbar tramp vip viper widget \
- woman smtpmail url rcirc erc
-+INFO_FILES=dired-x efaq
++INFO_FILES=efaq
# Directory for local state files for all programs.
localstatedir=@localstatedir@
-@@ -250,7 +246,7 @@
+@@ -251,7 +247,7 @@
SUBDIR = lib-src src
# The makefiles of the directories in $SUBDIR.
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
-@@ -339,12 +335,6 @@
+@@ -340,12 +336,6 @@
man/Makefile: $(srcdir)/man/Makefile.in config.status
./config.status
oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status
./config.status
-@@ -616,8 +606,6 @@
+@@ -617,8 +607,6 @@
(cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
(cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
-(cd man && $(MAKE) $(MFLAGS) mostlyclean)
(cd leim; $(MAKE) $(MFLAGS) mostlyclean)
### `clean'
-@@ -634,8 +622,6 @@
+@@ -635,8 +623,6 @@
(cd lwlib; $(MAKE) $(MFLAGS) clean)
(cd lib-src; $(MAKE) $(MFLAGS) clean)
-(cd man && $(MAKE) $(MFLAGS) clean)
(cd leim; $(MAKE) $(MFLAGS) clean)
### `distclean'
-@@ -654,8 +640,6 @@
+@@ -655,8 +641,6 @@
(cd lwlib; $(MAKE) $(MFLAGS) distclean)
(cd lib-src; $(MAKE) $(MFLAGS) distclean)
(cd man && $(MAKE) $(MFLAGS) distclean)
(cd leim; $(MAKE) $(MFLAGS) distclean)
(cd lisp; $(MAKE) $(MFLAGS) distclean)
${top_distclean}
-@@ -677,8 +661,6 @@
+@@ -678,8 +662,6 @@
(cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
-(cd man && $(MAKE) $(MFLAGS) maintainer-clean)
(cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
${top_distclean}
-@@ -716,8 +698,6 @@
+@@ -717,8 +699,6 @@
(cd lisp; $(MAKE) $(MFLAGS) unlock)
(cd lisp/term; chmod u+w README *.el)
(cd man; chmod u+w *texi* ChangeLog split-man)
(cd oldXMenu; chmod u+w *.[ch] Makefile README)
(cd lwlib; chmod u+w *.[ch] Makefile README)
(cd src; $(MAKE) $(MFLAGS) unlock)
-@@ -730,8 +710,6 @@
+@@ -731,8 +711,6 @@
(cd lisp; $(MAKE) $(MFLAGS) relock)
(cd lisp/term; chmod u+w README *.el)
(cd man; chmod u+w *texi* ChangeLog split-man)
(cd oldXMenu; chmod u+w *.[ch] Makefile README)
(cd lwlib; chmod u+w *.[ch] Makefile README)
(cd src; $(MAKE) $(MFLAGS) relock)
-@@ -754,12 +732,8 @@
+@@ -755,12 +733,8 @@
# so we can do ok running make in the build dir.
info: force-info
-(cd man; $(MAKE) $(MFLAGS) info)
#### Bootstrapping.
-@@ -809,6 +783,4 @@
+@@ -810,6 +784,4 @@
(cd lwlib; $(MAKE) $(MFLAGS) clean)
(cd lib-src; $(MAKE) $(MFLAGS) clean)
-(cd man && $(MAKE) $(MFLAGS) clean)
- pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
- speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
- newsticker.dvi emacs-xtra.dvi rcirc.dvi erc.dvi
-+INFO_TARGETS = ../info/dired-x ../info/efaq
-+DVI_TARGETS = dired-x.dvi faq.dvi
++INFO_TARGETS = ../info/efaq
++DVI_TARGETS = faq.dvi
INFOSOURCES = info.texi
# The following rule does not work with all versions of `make'.
-@@ -61,64 +45,6 @@
+@@ -61,65 +45,6 @@
TEXI2DVI = texi2dvi
ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
-EMACSSOURCES= \
- ${srcdir}/emacs.texi \
- ${srcdir}/doclicense.texi \
+- ${srcdir}/gpl.texi \
- ${srcdir}/screen.texi \
- ${srcdir}/commands.texi \
- ${srcdir}/entering.texi \
info: $(top_srcdir)/info $(INFO_TARGETS)
$(top_srcdir)/info:
-@@ -131,222 +57,16 @@
+@@ -132,222 +57,11 @@
# to exist in the build directory.
# In a distribution of Emacs, the Info files should be up to date.
-cl.dvi: cl.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
-
- ../info/dired-x: dired-x.texi
- cd $(srcdir); $(MAKEINFO) dired-x.texi
- dired-x.dvi: dired-x.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
-
+-../info/dired-x: dired-x.texi
+- cd $(srcdir); $(MAKEINFO) dired-x.texi
+-dired-x.dvi: dired-x.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
+-
-../info/ediff: ediff.texi
- cd $(srcdir); $(MAKEINFO) ediff.texi
-ediff.dvi: ediff.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
-
-../info/emacs-mime: emacs-mime.texi
-- cd $(srcdir); $(MAKEINFO) emacs-mime.texi
+- cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
-emacs-mime.dvi: emacs-mime.texi
- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
-
===================================================================
--- sid.orig/configure.in
+++ sid/configure.in
-@@ -3305,7 +3305,7 @@
+@@ -3346,7 +3346,7 @@
AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \
===================================================================
--- sid.orig/etc/NEWS
+++ sid/etc/NEWS
-@@ -35,6 +35,11 @@
- ** cua.el, cua-mode.el: remove old versions.
-
+@@ -15,6 +15,11 @@
+ You can narrow news to a specific version by calling `view-emacs-news'
+ with a prefix argument or by typing C-u C-h C-n.
\f
+* Debian specific changes to Emacs
+
+Please see /usr/share/doc/emacs22-common/README.Debian.gz.
+
+\f
- * Installation Changes in Emacs 22.1
+ * About external Lisp packages
- ** You can build Emacs with Gtk+ widgets by specifying `--with-x-toolkit=gtk'
+ When you upgrade to Emacs 22 from a previous version, some older
-fix-emacs-manpage.diff
-fix-local-variables-risk-cve-2007-5795.diff
-fix-bitmap-icon-arg.diff
debian-site-init-el.diff
debian-startup.diff
debian-adjust-mail-from-addresses.diff
handle-dfsg-split.diff
misc-unseparated.diff
fix-vc-path.diff
-fix-cc-mode-local-vars.diff
require-movemail-use-liblockfile.diff
avoid-fakemail-mail-loss.diff
version-mention-debian.diff
-support-gnu-kfreebsd.diff
-fix-format-overflow-cve-2007-6109.diff
-fix-auto-save-file-name.diff
-fix-switch-to-buffer-other-frame.diff
autofiles.diff
+++ /dev/null
-* Support for GNU/kFreeBSD has been added.
- Patch: support-gnu-kfreebsd.diff
- Provided-by: Petr Salinger <Petr.Salinger@seznam.cz>
- Date: Tue, 13 Nov 2007 23:41:25 +0100 (CET)
- Added-by: Rob Browning <rlb@defaultvalue.org>
-
-Index: sid/configure.in
-===================================================================
---- sid.orig/configure.in
-+++ sid/configure.in
-@@ -249,6 +249,19 @@
- esac
- ;;
-
-+ ## FreeBSD kenrel + glibc based userland
-+ *-*-kfreebsd*gnu* )
-+ opsys=gnu-kfreebsd
-+ case "${canonical}" in
-+ alpha*-*-kfreebsd*) machine=alpha ;;
-+ ia64-*-kfreebsd*) machine=ia64 ;;
-+ sparc64-*-kfreebsd*) machine=sparc ;;
-+ powerpc-*-kfreebsd*) machine=macppc ;;
-+ i[3456]86-*-kfreebsd*) machine=intel386 ;;
-+ amd64-*-kfreebsd*|x86_64-*-kfreebsd*) machine=amdx86-64 ;;
-+ esac
-+ ;;
-+
- ## NetBSD ports
- *-*-netbsd* )
- opsys=netbsd
-Index: sid/src/s/gnu-kfreebsd.h
-===================================================================
---- /dev/null
-+++ sid/src/s/gnu-kfreebsd.h
-@@ -0,0 +1,10 @@
-+
-+#include "gnu-linux.h"
-+
-+/* SYSTEM_TYPE should indicate the kind of system you are using.
-+ It sets the Lisp variable system-type. */
-+#undef SYSTEM_TYPE
-+#define SYSTEM_TYPE "gnu/kfreebsd" /* All the best software is free. */
-+
-+#define NO_TERMIO /* use only <termios.h> */
-+
===================================================================
--- sid.orig/lisp/version.el
+++ sid/lisp/version.el
-@@ -55,8 +55,8 @@
+@@ -58,8 +58,8 @@
(interactive "P")
(let ((version-string
(format (if (not (interactive-p))
# Info files that are going to show up in the main dir.
main_dir_info_files := \
- dired-x \
efaq
# Files that the build stage depends on (may also be listed in other vars).
$(checkdir)
# first build has to be a bootstrap build
cd debian/build-x && $(build_cmd) bootstrap
+ cd debian/build-x && $(build_cmd) clean
+ cd debian/build-x && $(build_cmd)
cd debian/build-nox && $(build_cmd)
cd debian/build-gtk && $(build_cmd)
mkdir -p debian/stamp && touch $@
# At least etc/COPYING is needed by M-x describe-copying.
rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING
rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/lisp/COPYING
- diff -q COPYING /usr/share/common-licenses/GPL-2
- dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-2 \
+ dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \
usr/share/emacs/$(runtime_ver)/etc/COPYING
- dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-2 \
+ dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \
usr/share/emacs/$(runtime_ver)/lisp/COPYING
# Install replacements for non-free files that can be reached
projects / emacs.git / commitdiff